From 91788df76ec3314afca8ce009d3f12d9ca5ed744 Mon Sep 17 00:00:00 2001 From: "akw27@arcadians.cl.cam.ac.uk" Date: Sun, 3 Jul 2005 14:14:09 +0000 Subject: [PATCH] Clean-up of blktap and parallax user space code. Move parallax stuff to its own sub directory and tidy Makefiles a bit. Signed-off-by: andrew.warfield@cl.cam.ac.uk Signed-off-by: Nguyen Anh Quynh --HG-- rename : tools/blktap/README-PARALLAX => tools/blktap/parallax/README rename : tools/blktap/block-async.c => tools/blktap/parallax/block-async.c rename : tools/blktap/block-async.h => tools/blktap/parallax/block-async.h rename : tools/blktap/blockstore.c => tools/blktap/parallax/blockstore.c rename : tools/blktap/blockstore.h => tools/blktap/parallax/blockstore.h rename : tools/blktap/blockstored.c => tools/blktap/parallax/blockstored.c rename : tools/blktap/bstest.c => tools/blktap/parallax/bstest.c rename : tools/blktap/parallax.c => tools/blktap/parallax/parallax.c rename : tools/blktap/radix.c => tools/blktap/parallax/radix.c rename : tools/blktap/radix.h => tools/blktap/parallax/radix.h rename : tools/blktap/requests-async.c => tools/blktap/parallax/requests-async.c rename : tools/blktap/requests-async.h => tools/blktap/parallax/requests-async.h rename : tools/blktap/snaplog.c => tools/blktap/parallax/snaplog.c rename : tools/blktap/snaplog.h => tools/blktap/parallax/snaplog.h rename : tools/blktap/vdi.c => tools/blktap/parallax/vdi.c rename : tools/blktap/vdi.h => tools/blktap/parallax/vdi.h rename : tools/blktap/vdi_create.c => tools/blktap/parallax/vdi_create.c rename : tools/blktap/vdi_fill.c => tools/blktap/parallax/vdi_fill.c rename : tools/blktap/vdi_list.c => tools/blktap/parallax/vdi_list.c rename : tools/blktap/vdi_snap.c => tools/blktap/parallax/vdi_snap.c rename : tools/blktap/vdi_snap_delete.c => tools/blktap/parallax/vdi_snap_delete.c rename : tools/blktap/vdi_snap_list.c => tools/blktap/parallax/vdi_snap_list.c rename : tools/blktap/vdi_tree.c => tools/blktap/parallax/vdi_tree.c rename : tools/blktap/vdi_unittest.c => tools/blktap/parallax/vdi_unittest.c rename : tools/blktap/vdi_validate.c => tools/blktap/parallax/vdi_validate.c --- tools/blktap/Makefile | 103 +++++------------- .../{README-PARALLAX => parallax/README} | 0 tools/blktap/{ => parallax}/block-async.c | 0 tools/blktap/{ => parallax}/block-async.h | 0 tools/blktap/{ => parallax}/blockstore.c | 0 tools/blktap/{ => parallax}/blockstore.h | 0 tools/blktap/{ => parallax}/blockstored.c | 0 tools/blktap/{ => parallax}/bstest.c | 0 tools/blktap/{ => parallax}/parallax.c | 0 tools/blktap/{ => parallax}/radix.c | 0 tools/blktap/{ => parallax}/radix.h | 0 tools/blktap/{ => parallax}/requests-async.c | 0 tools/blktap/{ => parallax}/requests-async.h | 0 tools/blktap/{ => parallax}/snaplog.c | 0 tools/blktap/{ => parallax}/snaplog.h | 0 tools/blktap/{ => parallax}/vdi.c | 0 tools/blktap/{ => parallax}/vdi.h | 0 tools/blktap/{ => parallax}/vdi_create.c | 0 tools/blktap/{ => parallax}/vdi_fill.c | 0 tools/blktap/{ => parallax}/vdi_list.c | 0 tools/blktap/{ => parallax}/vdi_snap.c | 0 tools/blktap/{ => parallax}/vdi_snap_delete.c | 0 tools/blktap/{ => parallax}/vdi_snap_list.c | 0 tools/blktap/{ => parallax}/vdi_tree.c | 0 tools/blktap/{ => parallax}/vdi_unittest.c | 0 tools/blktap/{ => parallax}/vdi_validate.c | 0 26 files changed, 28 insertions(+), 75 deletions(-) rename tools/blktap/{README-PARALLAX => parallax/README} (100%) rename tools/blktap/{ => parallax}/block-async.c (100%) rename tools/blktap/{ => parallax}/block-async.h (100%) rename tools/blktap/{ => parallax}/blockstore.c (100%) rename tools/blktap/{ => parallax}/blockstore.h (100%) rename tools/blktap/{ => parallax}/blockstored.c (100%) rename tools/blktap/{ => parallax}/bstest.c (100%) rename tools/blktap/{ => parallax}/parallax.c (100%) rename tools/blktap/{ => parallax}/radix.c (100%) rename tools/blktap/{ => parallax}/radix.h (100%) rename tools/blktap/{ => parallax}/requests-async.c (100%) rename tools/blktap/{ => parallax}/requests-async.h (100%) rename tools/blktap/{ => parallax}/snaplog.c (100%) rename tools/blktap/{ => parallax}/snaplog.h (100%) rename tools/blktap/{ => parallax}/vdi.c (100%) rename tools/blktap/{ => parallax}/vdi.h (100%) rename tools/blktap/{ => parallax}/vdi_create.c (100%) rename tools/blktap/{ => parallax}/vdi_fill.c (100%) rename tools/blktap/{ => parallax}/vdi_list.c (100%) rename tools/blktap/{ => parallax}/vdi_snap.c (100%) rename tools/blktap/{ => parallax}/vdi_snap_delete.c (100%) rename tools/blktap/{ => parallax}/vdi_snap_list.c (100%) rename tools/blktap/{ => parallax}/vdi_tree.c (100%) rename tools/blktap/{ => parallax}/vdi_unittest.c (100%) rename tools/blktap/{ => parallax}/vdi_validate.c (100%) diff --git a/tools/blktap/Makefile b/tools/blktap/Makefile index 6ee79ada9c..0fe5216212 100644 --- a/tools/blktap/Makefile +++ b/tools/blktap/Makefile @@ -2,64 +2,46 @@ MAJOR = 2.0 MINOR = 0 SONAME = libblktap.so.$(MAJOR) -CC = gcc - XEN_ROOT = ../.. include $(XEN_ROOT)/tools/Rules.mk -BLKTAP_INSTALL_DIR = /usr/sbin +SUBDIRS := +SUBDIRS += parallax + +BLKTAP_INSTALL_DIR = /usr/sbin -INSTALL = install -INSTALL_PROG = $(INSTALL) -m0755 -INSTALL_DIR = $(INSTALL) -d -m0755 +INSTALL = install +INSTALL_PROG = $(INSTALL) -m0755 +INSTALL_DIR = $(INSTALL) -d -m0755 -INCLUDES += +INCLUDES += -I. -I $(XEN_LIBXC) LIBS := -lpthread -lz SRCS := SRCS += blktaplib.c -PLX_SRCS := -PLX_SRCS += vdi.c -PLX_SRCS += radix.c -PLX_SRCS += snaplog.c -PLX_SRCS += blockstore.c -PLX_SRCS += block-async.c -PLX_SRCS += requests-async.c -VDI_SRCS := $(PLX_SRCS) -PLX_SRCS += parallax.c - -VDI_TOOLS := -VDI_TOOLS += vdi_create -VDI_TOOLS += vdi_list -VDI_TOOLS += vdi_snap -VDI_TOOLS += vdi_snap_list -VDI_TOOLS += vdi_snap_delete -VDI_TOOLS += vdi_fill -VDI_TOOLS += vdi_tree -VDI_TOOLS += vdi_validate - CFLAGS += -Wall CFLAGS += -Werror CFLAGS += -Wno-unused #CFLAGS += -O3 CFLAGS += -g3 CFLAGS += -fno-strict-aliasing -CFLAGS += -I $(XEN_LIBXC) -CFLAGS += $(INCLUDES) -I. CFLAGS += -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE # Get gcc to generate the dependencies for us. CFLAGS += -Wp,-MD,.$(@F).d +CFLAGS += $(INCLUDES) DEPS = .*.d OBJS = $(patsubst %.c,%.o,$(SRCS)) -IBINS = blkdump parallax $(VDI_TOOLS) +IBINS = blkdump LIB = libblktap.so libblktap.so.$(MAJOR) libblktap.so.$(MAJOR).$(MINOR) -all: mk-symlinks blkdump $(VDI_TOOLS) parallax blockstored - $(MAKE) $(LIB) +all: mk-symlinks libblktap.so blkdump + @set -e; for subdir in $(SUBDIRS); do \ + $(MAKE) -C $$subdir $@; \ + done LINUX_ROOT := $(wildcard $(XEN_ROOT)/linux-2.6.*-xen-sparse) mk-symlinks: @@ -77,10 +59,16 @@ install: all $(INSTALL_DIR) -p $(DESTDIR)/usr/include $(INSTALL_PROG) $(LIB) $(DESTDIR)/usr/$(LIBDIR) $(INSTALL_PROG) blktaplib.h $(DESTDIR)/usr/include - $(INSTALL_PROG) $(IBINS) $(DESTDIR)/$(BLKTAP_INSTALL_DIR) + $(INSTALL_PROG) $(IBINS) $(DESTDIR)$(BLKTAP_INSTALL_DIR) + @set -e; for subdir in $(SUBDIRS); do \ + $(MAKE) -C $$subdir $@; \ + done clean: - rm -rf *.a *.so *.o *.rpm $(LIB) *~ $(DEPS) xen TAGS blkdump $(VDI_TOOLS) parallax vdi_unittest + rm -rf *.a *.so *.o *.rpm $(LIB) *~ $(DEPS) xen TAGS blkdump + @set -e; for subdir in $(SUBDIRS); do \ + $(MAKE) -C $$subdir $@; \ + done rpm: all rm -rf staging @@ -91,52 +79,17 @@ rpm: all mv staging/i386/*.rpm . rm -rf staging -libblktap.so: +libblktap.so: $(OBJS) + $(CC) $(CFLAGS) -Wl,-soname -Wl,$(SONAME) -shared -o \ + libblktap.so.$(MAJOR).$(MINOR) $^ $(LIBS) + ln -sf libblktap.so.$(MAJOR).$(MINOR) libblktap.so.$(MAJOR) ln -sf libblktap.so.$(MAJOR) $@ -libblktap.so.$(MAJOR): - ln -sf libblktap.so.$(MAJOR).$(MINOR) $@ -libblktap.so.$(MAJOR).$(MINOR): $(OBJS) - $(CC) -Wl,-soname -Wl,$(SONAME) -shared -o $@ $^ $(LIBS) -blkdump: $(LIB) +blkdump: libblktap.so $(CC) $(CFLAGS) -o blkdump -L$(XEN_LIBXC) -L. -l blktap blkdump.c -parallax: $(LIB) $(PLX_SRCS) - $(CC) $(CFLAGS) -o parallax -L$(XEN_LIBXC) -L. -lblktap $(LIBS) $(PLX_SRCS) - -vdi_list: $(LIB) vdi_list.c $(VDI_SRCS) - $(CC) $(CFLAGS) -g3 -o vdi_list vdi_list.c $(LIBS) $(VDI_SRCS) - -vdi_create: $(LIB) vdi_create.c $(VDI_SRCS) - $(CC) $(CFLAGS) -g3 -o vdi_create vdi_create.c $(LIBS) $(VDI_SRCS) - -vdi_snap: $(LIB) vdi_snap.c $(VDI_SRCS) - $(CC) $(CFLAGS) -g3 -o vdi_snap vdi_snap.c $(LIBS) $(VDI_SRCS) - -vdi_snap_list: $(LIB) vdi_snap_list.c $(VDI_SRCS) - $(CC) $(CFLAGS) -g3 -o vdi_snap_list vdi_snap_list.c $(LIBS) $(VDI_SRCS) - -vdi_snap_delete: $(LIB) vdi_snap_delete.c $(VDI_SRCS) - $(CC) $(CFLAGS) -g3 -o vdi_snap_delete vdi_snap_delete.c $(LIBS) $(VDI_SRCS) - -vdi_tree: $(LIB) vdi_tree.c $(VDI_SRCS) - $(CC) $(CFLAGS) -g3 -o vdi_tree vdi_tree.c $(LIBS) $(VDI_SRCS) - -vdi_fill: $(LIB) vdi_fill.c $(VDI_SRCS) - $(CC) $(CFLAGS) -g3 -o vdi_fill vdi_fill.c $(LIBS) $(VDI_SRCS) - -vdi_validate: $(LIB) vdi_validate.c $(VDI_SRCS) - $(CC) $(CFLAGS) -g3 -o vdi_validate vdi_validate.c $(LIBS) $(VDI_SRCS) - -vdi_unittest: $(LIB) vdi_unittest.c $(VDI_SRCS) - $(CC) $(CFLAGS) -g3 -o vdi_unittest vdi_unittest.c $(LIBS) $(VDI_SRCS) - -blockstored: blockstored.c - $(CC) $(CFLAGS) -g3 -o blockstored $(LIBS) blockstored.c -bstest: bstest.c blockstore.c - $(CC) $(CFLAGS) -g3 -o bstest bstest.c $(LIBS) blockstore.c - .PHONY: TAGS clean install mk-symlinks rpm + TAGS: etags -t $(SRCS) *.h diff --git a/tools/blktap/README-PARALLAX b/tools/blktap/parallax/README similarity index 100% rename from tools/blktap/README-PARALLAX rename to tools/blktap/parallax/README diff --git a/tools/blktap/block-async.c b/tools/blktap/parallax/block-async.c similarity index 100% rename from tools/blktap/block-async.c rename to tools/blktap/parallax/block-async.c diff --git a/tools/blktap/block-async.h b/tools/blktap/parallax/block-async.h similarity index 100% rename from tools/blktap/block-async.h rename to tools/blktap/parallax/block-async.h diff --git a/tools/blktap/blockstore.c b/tools/blktap/parallax/blockstore.c similarity index 100% rename from tools/blktap/blockstore.c rename to tools/blktap/parallax/blockstore.c diff --git a/tools/blktap/blockstore.h b/tools/blktap/parallax/blockstore.h similarity index 100% rename from tools/blktap/blockstore.h rename to tools/blktap/parallax/blockstore.h diff --git a/tools/blktap/blockstored.c b/tools/blktap/parallax/blockstored.c similarity index 100% rename from tools/blktap/blockstored.c rename to tools/blktap/parallax/blockstored.c diff --git a/tools/blktap/bstest.c b/tools/blktap/parallax/bstest.c similarity index 100% rename from tools/blktap/bstest.c rename to tools/blktap/parallax/bstest.c diff --git a/tools/blktap/parallax.c b/tools/blktap/parallax/parallax.c similarity index 100% rename from tools/blktap/parallax.c rename to tools/blktap/parallax/parallax.c diff --git a/tools/blktap/radix.c b/tools/blktap/parallax/radix.c similarity index 100% rename from tools/blktap/radix.c rename to tools/blktap/parallax/radix.c diff --git a/tools/blktap/radix.h b/tools/blktap/parallax/radix.h similarity index 100% rename from tools/blktap/radix.h rename to tools/blktap/parallax/radix.h diff --git a/tools/blktap/requests-async.c b/tools/blktap/parallax/requests-async.c similarity index 100% rename from tools/blktap/requests-async.c rename to tools/blktap/parallax/requests-async.c diff --git a/tools/blktap/requests-async.h b/tools/blktap/parallax/requests-async.h similarity index 100% rename from tools/blktap/requests-async.h rename to tools/blktap/parallax/requests-async.h diff --git a/tools/blktap/snaplog.c b/tools/blktap/parallax/snaplog.c similarity index 100% rename from tools/blktap/snaplog.c rename to tools/blktap/parallax/snaplog.c diff --git a/tools/blktap/snaplog.h b/tools/blktap/parallax/snaplog.h similarity index 100% rename from tools/blktap/snaplog.h rename to tools/blktap/parallax/snaplog.h diff --git a/tools/blktap/vdi.c b/tools/blktap/parallax/vdi.c similarity index 100% rename from tools/blktap/vdi.c rename to tools/blktap/parallax/vdi.c diff --git a/tools/blktap/vdi.h b/tools/blktap/parallax/vdi.h similarity index 100% rename from tools/blktap/vdi.h rename to tools/blktap/parallax/vdi.h diff --git a/tools/blktap/vdi_create.c b/tools/blktap/parallax/vdi_create.c similarity index 100% rename from tools/blktap/vdi_create.c rename to tools/blktap/parallax/vdi_create.c diff --git a/tools/blktap/vdi_fill.c b/tools/blktap/parallax/vdi_fill.c similarity index 100% rename from tools/blktap/vdi_fill.c rename to tools/blktap/parallax/vdi_fill.c diff --git a/tools/blktap/vdi_list.c b/tools/blktap/parallax/vdi_list.c similarity index 100% rename from tools/blktap/vdi_list.c rename to tools/blktap/parallax/vdi_list.c diff --git a/tools/blktap/vdi_snap.c b/tools/blktap/parallax/vdi_snap.c similarity index 100% rename from tools/blktap/vdi_snap.c rename to tools/blktap/parallax/vdi_snap.c diff --git a/tools/blktap/vdi_snap_delete.c b/tools/blktap/parallax/vdi_snap_delete.c similarity index 100% rename from tools/blktap/vdi_snap_delete.c rename to tools/blktap/parallax/vdi_snap_delete.c diff --git a/tools/blktap/vdi_snap_list.c b/tools/blktap/parallax/vdi_snap_list.c similarity index 100% rename from tools/blktap/vdi_snap_list.c rename to tools/blktap/parallax/vdi_snap_list.c diff --git a/tools/blktap/vdi_tree.c b/tools/blktap/parallax/vdi_tree.c similarity index 100% rename from tools/blktap/vdi_tree.c rename to tools/blktap/parallax/vdi_tree.c diff --git a/tools/blktap/vdi_unittest.c b/tools/blktap/parallax/vdi_unittest.c similarity index 100% rename from tools/blktap/vdi_unittest.c rename to tools/blktap/parallax/vdi_unittest.c diff --git a/tools/blktap/vdi_validate.c b/tools/blktap/parallax/vdi_validate.c similarity index 100% rename from tools/blktap/vdi_validate.c rename to tools/blktap/parallax/vdi_validate.c -- 2.30.2